Merge branch 'upstream' into 3.08
authorSven Luther <luther@debian.org>
Mon, 12 Jul 2004 12:42:57 +0000 (12:42 +0000)
committerSven Luther <luther@debian.org>
Mon, 12 Jul 2004 12:42:57 +0000 (12:42 +0000)
commitd7c6468a46a2d034d6c9e7cca346925e273f7cd5
tree76587ed70b525b94637a1fa9b2e134af759af176
parent6986a853f53239698dcd6ffecf74bcc73aa837b9
parent2b1afd2abaaf893c93ea93cb5d7d68980f063fce
Merge branch 'upstream' into 3.08